combobox: fix a segfault
authorCosimo Cecchi <cosimoc@gnome.org>
Thu, 1 May 2014 17:43:20 +0000 (19:43 +0200)
committerCosimo Cecchi <cosimoc@gnome.org>
Thu, 1 May 2014 17:44:12 +0000 (19:44 +0200)
Don't dereference a NULL pointer.

gtk/gtkcombobox.c

index c67912f6118818153a177dfd7d45f3e9e2734ea7..557160482ae3b6b3cc09b2209054b0b6545828cd 100644 (file)
@@ -5602,11 +5602,11 @@ gtk_combo_box_get_preferred_height (GtkWidget *widget,
                                     gint      *minimum_size,
                                     gint      *natural_size)
 {
-  gint min_width;
+  gint min_width, nat_width;
 
   /* Combo box is height-for-width only
    * (so we always just reserve enough height for the minimum width) */
-  GTK_WIDGET_GET_CLASS (widget)->get_preferred_width (widget, &min_width, NULL);
+  GTK_WIDGET_GET_CLASS (widget)->get_preferred_width (widget, &min_width, &nat_width);
   GTK_WIDGET_GET_CLASS (widget)->get_preferred_height_for_width (widget, min_width, minimum_size, natural_size);
 }